Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[8.0] bgp per-peer dampening revert #9320

Merged
merged 14 commits into from
Aug 7, 2021
Merged

[8.0] bgp per-peer dampening revert #9320

merged 14 commits into from
Aug 7, 2021

Conversation

idryzhov
Copy link
Contributor

@idryzhov idryzhov commented Aug 6, 2021

Manual backport of #9256. Automatic doesn't work because of cherry-picking conflicts.

idryzhov added 14 commits August 6, 2021 21:35
@idryzhov
Revert "bgpd: fix missing damp info free when cleaning bgp path"
2b4bb9d 
This reverts commit 4538f89.

Signed-off-by: Igor Ryzhov <[email protected]>
@idryzhov
Revert "bgpd: cleanup bgp_damp_info_free"
6357428 
This reverts commit 97766ac.
@idryzhov
Revert "bgpd: fix incorrect usage of slist in dampening"
9cf3354 
This reverts commit 5054cfc.
@idryzhov
Revert "bgpd: fix missing list add in dampening"
60d5f8e 
This reverts commit cd58568.
@idryzhov
Revert "bgpd: Drop double-pointer for bgp_damp_info_free()"
9a87507 
This reverts commit 19971c9.
@idryzhov
Revert "bgpd: fix double free in dampening code"
d3debd7 
This reverts commit 96d6b8c.
@idryzhov
Revert "bgpd: Remove useless reuselist_node assignment before while l…
01d0c8a 
…oop"

This reverts commit 53048d3.
@idryzhov
Revert "bgpd: clear ip bgp dampening was not triggering the route cal…
842a345 
…culation for the prefix"

This reverts commit c8ddbd4.
@idryzhov
Revert "tests: topotests for route-flap dampening"
8227b67 
This reverts commit cd32a1a.

Signed-off-by: Igor Ryzhov <[email protected]>
@idryzhov
Revert "doc: user doc for route-flap dampening commands"
d52236a 
This reverts commit 54b3470.

Signed-off-by: Igor Ryzhov <[email protected]>
@idryzhov
Revert "bgpd: Consolidate dampening show run output with the rest of …
e9c0d6d 
…that code"

This reverts commit 39d8dd2.

Signed-off-by: Igor Ryzhov <[email protected]>
@idryzhov
Revert "bgpd: Do not output peer doppleganger dampened output"
d0f1c9d 
This reverts commit 783492c.

Signed-off-by: Igor Ryzhov <[email protected]>
@idryzhov
Revert "bgpd: vtysh commands for peer/group dampening profiles"
590134a 
This reverts commit 0221327.

Signed-off-by: Igor Ryzhov <[email protected]>
@idryzhov
Revert "bgpd: peer / peer group dampening profiles"
14abf9d 
This reverts commit 40ec334.

Signed-off-by: Igor Ryzhov <[email protected]>
polychaeta
polychaeta reviewed Aug 6, 2021
View reviewed changes
Copy link

@polychaeta polychaeta left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your contribution to FRR!

Click for style suggestions

To apply these suggestions:

curl -s https://gist.githubusercontent.com/polychaeta/844b0b8e09ae6b1291a79319e8d80c09/raw/6ce8d6c76ec2cbf2557ac8bb83a5508f19f706b7/cr_9320_1628279279.diff | git apply


diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 3490a4fa40..4df4b29c8f 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -3385,8 +3385,7 @@ static void bgp_rib_withdraw(struct bgp_dest *dest, struct bgp_path_info *pi,
 	    && peer->sort == BGP_PEER_EBGP)
 		if ((bgp_damp_withdraw(pi, dest, afi, safi, 0))
 		    == BGP_DAMP_SUPPRESSED) {
-			bgp_aggregate_decrement(peer->bgp, p, pi, afi,
-						safi);
+			bgp_aggregate_decrement(peer->bgp, p, pi, afi, safi);
 			return;
 		}
 
@@ -14360,8 +14359,8 @@ static int bgp_clear_damp_route(struct vty *vty, const char *view_name,
 					if (pi->extra && pi->extra->damp_info) {
 						pi_temp = pi->next;
 						bgp_damp_info_free(
-							pi->extra->damp_info,
-							1, afi, safi);
+							pi->extra->damp_info, 1,
+							afi, safi);
 						pi = pi_temp;
 					} else
 						pi = pi->next;
@@ -14382,8 +14381,8 @@ static int bgp_clear_damp_route(struct vty *vty, const char *view_name,
 					if (pi->extra && pi->extra->damp_info) {
 						pi_temp = pi->next;
 						bgp_damp_info_free(
-							pi->extra->damp_info,
-							1, afi, safi);
+							pi->extra->damp_info, 1,
+							afi, safi);
 						pi = pi_temp;
 					} else
 						pi = pi->next;

If you are a new contributor to FRR, please see our contributing guidelines.

After making changes, you do not need to create a new PR. You should perform an amend or interactive rebase followed by a force push.

@LabN-CI
Copy link
Collaborator

LabN-CI commented Aug 6, 2021

💚 Basic BGPD CI results: SUCCESS, 0 tests failed

Results table
_ _
Result SUCCESS git merge/9320 14abf9d
Date 08/06/2021
Start 15:55:23
Finish 16:20:56
Run-Time 25:33
Total 1813
Pass 1813
Fail 0
Valgrind-Errors
Valgrind-Loss
Details vncregress-2021-08-06-15:55:23.txt
Log autoscript-2021-08-06-15:56:34.log.bz2
Memory 484 513 425

For details, please contact louberger

@NetDEF-CI
Copy link
Collaborator

Continuous Integration Result: SUCCESSFUL

Congratulations, this patch passed basic tests

Tested-by: NetDEF / OpenSourceRouting.org CI System

CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20852/

This is a comment from an automated CI system.
For questions and feedback in regards to this CI system, please feel free to email
Martin Winter - mwinter (at) opensourcerouting.org.

Warnings Generated during build:

Checkout code: Successful with additional warnings 
cp: cannot stat './tests/topotests/bgp_features/peer1/exabgp.cfg': No such file or directory
cp: cannot stat './tests/topotests/bgp_features/peer2/exabgp.cfg': No such file or directory
cp: cannot stat './tests/topotests/bgp_features/peer3/exabgp.cfg': No such file or directory
cp: cannot stat './tests/topotests/bgp_features/peer4/exabgp.cfg': No such file or directory
Report for bgp_damp.c | 6 issues
===============================================
< WARNING: Block comments use a trailing */ on a separate line
< #44: FILE: /tmp/f1-2863/bgp_damp.c:44:
< WARNING: Block comments use * on subsequent lines
< #115: FILE: /tmp/f1-2863/bgp_damp.c:115:
< WARNING: Block comments use * on subsequent lines
< #131: FILE: /tmp/f1-2863/bgp_damp.c:131:
Report for bgp_damp.h | 6 issues
===============================================
< WARNING: Block comments use * on subsequent lines
< #29: FILE: /tmp/f1-2863/bgp_damp.h:29:
< WARNING: Block comments use a trailing */ on a separate line
< #29: FILE: /tmp/f1-2863/bgp_damp.h:29:
< WARNING: function definition argument 'struct vty *' should also have an identifier name
< #146: FILE: /tmp/f1-2863/bgp_damp.h:146:
Report for bgp_route.c | 4 issues
===============================================
< WARNING: Block comments use * on subsequent lines
< #3958: FILE: /tmp/f1-2863/bgp_route.c:3958:
< WARNING: Block comments use a trailing */ on a separate line
< #3959: FILE: /tmp/f1-2863/bgp_route.c:3959:

@donaldsharp donaldsharp merged commit 70fecd8 into FRRouting:stable/8.0 Aug 7, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@polychaeta polychaeta polychaeta left review comments

Assignees
No one assigned
Labels
bugfix
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@idryzhov @LabN-CI @NetDEF-CI @polychaeta @donaldsharp